From: Hans Ulrich Niedermann Date: Fri, 23 Oct 2020 08:42:38 +0000 (+0200) Subject: Correct the systemd version required for ConditionEnvironment= X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~616^2^2~692 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=38d642541cff665bc3c565198dcb7c3c8e3facdf;p=gnome-shell.git Correct the systemd version required for ConditionEnvironment= According to systemd's NEWS file, the ConditionEnvironment= setting has only been introduced in systemd 246, not in 245 like the comment in the services files claimed. https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1472#note_942075 Part-of: --- diff --git a/data/org.gnome.Shell@wayland.service.in b/data/org.gnome.Shell@wayland.service.in index 692d45bb3..12f7fbaa7 100644 --- a/data/org.gnome.Shell@wayland.service.in +++ b/data/org.gnome.Shell@wayland.service.in @@ -17,7 +17,7 @@ Before=gnome-session-initialized.target Slice=session.slice Type=notify # NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I -# with systemd >= 245. Also, the current solution is kind of painful +# with systemd >= 246. Also, the current solution is kind of painful # as systemd had a bug where it retries the condition. # Only start if the template instance matches the session type. ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2' diff --git a/data/org.gnome.Shell@x11.service.in b/data/org.gnome.Shell@x11.service.in index a70f24909..f2ff0ce34 100644 --- a/data/org.gnome.Shell@x11.service.in +++ b/data/org.gnome.Shell@x11.service.in @@ -21,7 +21,7 @@ StartLimitBurst=3 Slice=session.slice Type=notify # NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I -# with systemd >= 245. Also, the current solution is kind of painful +# with systemd >= 246. Also, the current solution is kind of painful # as systemd had a bug where it retries the condition. # Only start if the template instance matches the session type. ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'